Merge branch 'master' of github.com:jquery/jquery
authorjaubourg <j@ubourg.net>
Wed, 26 Jan 2011 23:59:11 +0000 (00:59 +0100)
committerjaubourg <j@ubourg.net>
Wed, 26 Jan 2011 23:59:11 +0000 (00:59 +0100)

Trivial merge